Remove more redundant tests