Added some tests with debug puts