First steps to fix ParameterHandler to work with global parameters
Minor test enhancement