CAL-351 fix unit test