Tests after refactoring