Remove test for class that is gone now
Fix a couple tests