Add tests to completely cover Entity model