Improve tests and parsing.