Removed some redundant tests