DAR-730 Fixes to make unit tests pass.