tests cleanups