bugfix
tests for each entity