Fix basic tests, add test for capture of named groups