DA-71: Added remaining unit tests.
Resolved merge conflicts.