Rename 'usage' to 'cocoa' for must call super rule
Add back moved files. Improve test story
Factor out utility method