Ensure that the parameter prefix is only applied when necessary.
Parametrized unit tests to cover every situation.
Merge pull request #69 from SeriousM/correct_parameter_handling

Ensure that the parameter prefix is only applied when necessary.