Add describe of the module we're testing
Move matcher spec to the directory of things that the matcher tests, and rename