Merge pull request #557 from RandyGaul/fix-test-math