Remove bad test case. Add some debug code