Merge "Improve test coverage for ApiStashEdit"