Vim numbers: Add test cases, and include count