Merge "signature tests: Improve error handling in tests"