Additions to test, changes to print statements
Remove cruft