Merge "Add some basic DA unit tests" into mnc-dev