added client tests and bad request tests
removed unused fileds from test cases and templates
clarified everything and added emres test cases
final touches