Removing database test duplication