Fixing tests and parsing.