Tests green :green_heart: Need refactoring