Remove debug puts & add a few more tests