cb63e66 Improve code coverage for Entity.