Add more debugging information to removal tests.