removed some redundant tests