GPII-93: Fixed code so base testcases runs again