Adding tests, working out NUMLIT issue in scanner