Cleanup

Cleaned up debug messages, added all tests in debug output.