Minor cleanup of tests.
Failing test exposing #canonicalize param issue

as reported by #1189
Fix #canonicalize parameter arguments.

Fixes #1189.
Merge branch 'flavorjones-canonicalize-params-gh1189'