Fix unit tests
Merge branch 'master' of github.com:dmwm/DAS