Update tests for CHEF-4760 change.