Fix some more tests for AJP