test-condition fixes