Merge "Move to isolated testing."