Comment out test and fix test.