Fixed tests in client. Fixed git trouble in MVC project.