redundant tests removed