Improve model-related test coverage
Add tests for API client module