Apply a patch fixing tests and some parsing logic

This let's us get rid of the pre-test target.