Updated TestSuite to JPM
Changes for JPM