Commented out some more tests