Remove test duplication