Ensure that the parameter prefix is only applied when necessary.

Parametrized unit tests to cover every situation.

This is for issue #67