Regression tests and printline cleanup

Please review the post-review. Removed a utility method, added an expected to one unittest and removed some unneccesary checkNotNull's.