Added additional unit test to EntityTest