Move more printlns to logging
Moved some main method tests into proper tests.
Merge pull request #504 from rorygraves/more_logging

Move more printlns to logging