Removed more tests