Added more entities and basic tests