Comment out some more tests to narrow issue down