DDF-391  added integration level unit tests
DDF-391  added integration level unit tests
DDF-391  updates to unit tests