A few more test cleanups