Fix issue with multiply (params were reversed); add more thorough tests