made test runnable on tc
better cleanup