Adjust the rest of the tests due to r224849.