fixes within the test client