Reinstating the cleanup code in an acceptance test