Merge "Adapted test scripts to changes in PMS 2.0"