Fixed unit tests for EntityVsTypeConverter