Modified some debug output.
Added some test output.