fixed following tests: ClientServer, Filtered