Refactoring garden and more tests.