Fixes to number methods and addition of tests for same.