Bulk update tests for recent language module changes.
Change required due to recent change to emptyOrSingleton().
Fix the model loading part of #1699
Issue #1699: Tests