Fixed JUnit tests for DDF-891