remove some test duplication