Merge "Add $options parameter for testUserForCreation()"