Refactoring tests, added custom matchers for helpful error messages