Refactoring the tests
Tidy up greeting
Doing some initial templating work