Added message filter in client test
Fixed NPE