Move more printlns to logging

Moved some main method tests into proper tests.

No functional changes just more tidying :)
+ Coverage is now 25% :)