More tests cleanups.