Remove test redundancy