Correct issues in the test-client