removing superfluous regex captures to be more in-line with the test