Removed some unneeded tests