Add a couple specs for better coverage
Fix deprecation warning messages for deprecated methods
Remove some duplicate checks when defining association methods