cleanup, test readiness