better cleanup, error handling on test runner