towards contained testing suite. All identified state cache modifying scripts updated. However, other scripts are failing