Merge "Don't allow stashing in tests for now" into sc-v2-dev