End Tests Refactoring