DAR-18 Added unit tests.
Merge branch 'DAR-18' into dev