Adapted test scripts to newer version of procedures