Fix the loadable type checking; use type, not ID.
Fix the tests actually.