Fix spacing in matcher class

For some reason the tests didn't like the spacing we used for this class, so I played around with it and now the pending tests are working.