test for #20
fix test for #20
patched messages to expect trimming,
fixed #20
Merge branch 'fix20'