Add more tests, take out id and text regexes from lexer, fix errors when
parsing arguments