Added Entity unittests