- also add APIService.kindToResourceGroupVersion
- update APIService tests
- update DataService tests that fail after fixture update