Testtool added
cleanup