Modified the test suite to support NONE captured groups