remove dummy begin and eof token and update corresponding tests