Fix the tests for the new debugging