Better coverage for API