Fix unit tests for [CHEF-2750]