Fixing testes. Now with all 36 tests green!
Refactoring