add some tests for Entity
More entity tests and todo tests