Adding more tests
Removing unneeded console debugging calls