Merge "Remove unreliable effect tests." into ics-mr1