Remove test duplication, add ore tests