Merge "Modify tests to make them less fragile"