Started test refactoring