combine scripts, tests fail. separate cleanup steps.