Revised test case parser