Add custom matchers
Removed one test. Put descriptions in it statements