Added handler to stop test