TDD slightly refactored and done