Moved to data-driven parser tests

Still thinking of the best approach... subject to change