Upgrade user import

Updated tests for user import