Remove unnecessary saves in test suite