Merge pull request #611 from boegel/unit_testing

move unit tests to test.framework
adjust changes required by moving unit tests into test/framework