More tests, more things parse

Preps work better.