Revert some changes in the object mappings - other work needs to be done to fix the duplicate key problem; Changed the output path of one test to the TestData directory; updating the mtdb test files.
Merge remote-tracking branch 'origin-github/master'