tests, cleanups