Code tidy using eclipse standard formatter
Move some methods into TestHandler
Update test stanza