Updated

Change-Id: If832c56075bf4092b6afe01acbe635c1b4338e2b
re-instated g_mptest in C++

Change-Id: Ib1625b6b75113fc8af302b1fa03687d5b43064fa
updates

Change-Id: I84562de47c3ac4cefd5ef2f9fb76cbc93cf55260