updated all tests to work with entity kinds rather than entity types