Shifting tests around and cleaning out old stuff. No code change.