Refactored class constructors, more separated TDD