fix some of the parsing issues and add a test executable and a test case