Got green tests
Another test working
refactoring