Refactor user creation tests

Change-Id: Id3df24314444a710671ac1d0d694ad4af3575e0e