added testing for user_client user and friend models
added tests for user_client models and controllers
added teting for user_client model and controllers
merge conflict resolution
merge conflict