Change some tests due to a field refactoring.