Added additional Entity tests