combine little simpler

Change-Id: I6639d7f402345744f79598ef9f4492de4879e786
Parse error tests

Change-Id: I9d40bb63bf2afd8e3ec836b77313fd0f89a05984