added unit testing for users
fixed merges