revisions for @smichr

- restore matching tests but without exclude options
- fix ,'s
- docstring revisions so doctest passes