support unmatched syntax for bulk cases form
fix bug: 'when' followed by 'test that' is not handled
fix and add test cases for bulk cases