Reduce unnecessary test duplication