Enhance RunParser and BuildParser and extend testcase on that