Remove isDigit wrapper and add number only test case
Fix potential bug in file position