rename user1/user2
add additional tests
remove extra idd