Updated the frameworks and unit tests.  Partly from pull request #13