Finish up changes to the tests...

... Ensures that the new parsers actually make a difference.