D-15895 regex capture issues

Spock functional tests.