Include class names in function parameter lists to support 'strict' mode
Add group pragmas to test
update existing test for changes in this branch
add tests for correct pattern closing block & inline wrap segments