cleanups
test tools