A bit of polish.
Changed test keyword argument names to use namespace prefixes consistently.