Cleaning up some print statements
Add some tests