[PATCH v11 5/5] rollback changes in tests