Fix the retrieveContact test fail on asserting relatiotionship for current
employer.

The test was checking for a relationship to an organization contact with an
ID of 1, but that was the ID of the individual contact record that's created
at the start of this test function. I've fixed this by explicitly creating an
organization contact and using that for the current employer relationship, so
we always know what the contact ID of the organization record will be.
Revert "Fix the retrieveContact test fail on asserting relatiotionship for current"

This reverts commit 900c5b9c341b8f5eeb346941da4ec891b02bb417.
Fix the retrieveContact test fail on asserting relatiotionship for current employer.

The test was checking for a relationship to an organization contact with an
ID of 1, but that was the ID of the individual contact record that's created
at the start of this test function. I've fixed this by explicitly creating a
organization contact and using that for the current employer relationship, so
we always know what the contact ID of the organization record will be.

This commit also adds a random string to the organization record's name to
ensure it's unique.
Merge pull request #2944 from giant-rabbit/feature/ContactTest-fix

Feature/contact test fix