Changes to MGC class library and some missing unit test files for inner class