A couple of test fixes for CAMEL-6939