Reorganising Parser test cases