unit test fixes
Merge branch 'Release/MileStone3/debug' of https://github.com/srnjcbsn/Beduin into Release/MileStone3/debug