adjust changes required by moving unit tests into test/framework
Merge pull request #613 from boegel/unit_testing

adjust changes required by moving unit tests into test/framework