more cleanups
Lots of test cleanups