Refactoring for tests 1.6 - Invalid Class