added userTest
merged and updated user