add rerun tests to clear handler