A couple parsing improvements and a new test case added to