Some refactoring of test code.
Refactored test code.
Added multiplication support.