Improve code coverage for Country, Object and State