Fixed numeric parser
Added some tests for it