fix unit tests after changes in framework
Merge pull request #377 from boegel/fix_unit_tests

fix unit tests after changes in framework