Remove imports, use objc over NSObject subclass
Add contain matcher