some cleanups for rump tests