Refactoring for clarity of invocation and argument matching. -Jon
Fixing test messages. -Jon