Small changes and unit test
Broke printing out to a separate class