Improved test coverage for common-test and common