Updates to testing plus some parsing tests.