refactoring and activating the tests