Move User test to the appropriate location