Add a test for #58
Fix the Mul ordering issue

Fixes #58.