Removes debugging. Fixes more tests