Fix tests with new not-stripped value
Modify regex on terminating comment to allow space before */