Downgrade a pile of stuff, fixing tests