Upgrade user import

Updated tests for user import
Merge pull request #487 from sammyshj/updateimport

Update user import