fixed unit tests, broken in #59
Progress WIP
Merge pull request #71 from pborreli/staabm-dl-unit

fixed unit tests, broken in #59