move cleanup to before_script