cleanup, tests