CAL-805 CAL-804 update CF and fix test failure