Removed some debug, added test file for full system testing