Updating tests to remove duplication