fixed relations in entities
more tests