Update astropy.tests to use six instead of 2to3