Tweak to provide more consistent cloudi_core testing.