introduced client controller test
Conflict SOlved