Added more tests for all kinds of entity collections