Update tests.
Merge branch 'develop' of github.com:seivan/ScalarArithmetic into develop