Restructure spec by types

Categorize by type of matcher

Remove lines to be slim