DDF-828: Fix jenkins build errors in unit tests