Refactoring - working on the Tests