DDF-374: Added additional unit tests.