Fixing test client