dead code removed
unit test for AbstractEntity added