Added decoding for test client