Cleaned up mocha_number
Added tests