Time to refactoring!
I have been trying to just follow TDD but the design that I want did not came up.