Also update tests, including class-level pass-on of equivalencies
Also update tests, including class-level pass-on of equivalencies

funbaker/astropy,funbaker/astropy,kelle/astropy,dhomeier/astropy,lpsinger/astropy,AustereCuriosity/astropy,larrybradley/astropy,larrybradley/astropy,pllim/astropy,kelle/astropy,dhomeier/astropy,saimn/astropy,joergdietrich/astropy,MSeifert04/astropy,AustereCuriosity/astropy,StuartLittlefair/astropy,aleksandr-bakanov/astropy,DougBurke/astropy,StuartLittlefair/astropy,tbabej/astropy,saimn/astropy,larrybradley/astropy,larrybradley/astropy,DougBurke/astropy,kelle/astropy,lpsinger/astropy,MSeifert04/astropy,lpsinger/astropy,larrybradley/astropy,joergdietrich/astropy,dhomeier/astropy,pllim/astropy,pllim/astropy,stargaser/astropy,bsipocz/astropy,aleksandr-bakanov/astropy,mhvk/astropy,mhvk/astropy,StuartLittlefair/astropy,pllim/astropy,saimn/astropy,StuartLittlefair/astropy,MSeifert04/astropy,bsipocz/astropy,bsipocz/astropy,funbaker/astropy,astropy/astropy,dhomeier/astropy,stargaser/astropy,StuartLittlefair/astropy,tbabej/astropy,lpsinger/astropy,AustereCuriosity/astropy,tbabej/astropy,mhvk/astropy,aleksandr-bakanov/astropy,saimn/astropy,joergdietrich/astropy,joergdietrich/astropy,aleksandr-bakanov/astropy,saimn/astropy,mhvk/astropy,tbabej/astropy,joergdietrich/astropy,astropy/astropy,funbaker/astropy,astropy/astropy,astropy/astropy,AustereCuriosity/astropy,bsipocz/astropy,dhomeier/astropy,MSeifert04/astropy,lpsinger/astropy,mhvk/astropy,stargaser/astropy,tbabej/astropy,kelle/astropy,astropy/astropy,kelle/astropy,DougBurke/astropy,stargaser/astropy,DougBurke/astropy,pllim/astropy,AustereCuriosity/astropy