Transfer tests and test refactoring