Remove some test duplication