CAMEL-5944 - Slight test cleanup.