Improve test coverage (common)