Include new uncertainty classes in more tests
Include new uncertainty classes in more tests

...and do a bit of cleanup after rebase

pllim/astropy,saimn/astropy,larrybradley/astropy,bsipocz/astropy,astropy/astropy,MSeifert04/astropy,saimn/astropy,dhomeier/astropy,saimn/astropy,dhomeier/astropy,StuartLittlefair/astropy,mhvk/astropy,astropy/astropy,mhvk/astropy,astropy/astropy,mhvk/astropy,MSeifert04/astropy,lpsinger/astropy,StuartLittlefair/astropy,larrybradley/astropy,MSeifert04/astropy,bsipocz/astropy,dhomeier/astropy,astropy/astropy,stargaser/astropy,astropy/astropy,MSeifert04/astropy,pllim/astropy,lpsinger/astropy,StuartLittlefair/astropy,dhomeier/astropy,bsipocz/astropy,aleksandr-bakanov/astropy,pllim/astropy,bsipocz/astropy,pllim/astropy,aleksandr-bakanov/astropy,larrybradley/astropy,larrybradley/astropy,pllim/astropy,mhvk/astropy,aleksandr-bakanov/astropy,saimn/astropy,stargaser/astropy,mhvk/astropy,aleksandr-bakanov/astropy,stargaser/astropy,saimn/astropy,lpsinger/astropy,lpsinger/astropy,dhomeier/astropy,StuartLittlefair/astropy,stargaser/astropy,lpsinger/astropy,larrybradley/astropy,StuartLittlefair/astropy