DRY'd up spec even more, made custom matcher.