update parse and subparse tests to match spec