Tests are still broken, but the debug output is nicer at least