Fix broken test by reverting change b71a2ac12bfc3f9249666a8664dffcaff51f286f.
Added a couple of missing tests on the Entity class.