Modified testsystems to prepend scope identifiers on global context parameters.
Tried to avoid adding complexity by using intermediate temporary variables in energy expression.