Pull in test refactorings.