Clean-up and new test for parse