fix some CF8 compat issues with the tests