Fix intermittent failing specs

Previously, when the entire test suite was run, random specs would fail
as we swapped out the user creation method but did not change it back.
This ensures that the creation method will always return to its original
value.