clean up angularjs, add client_id into Client model, change should.include to should.containDeep