Fix typo and test loading.

Biggest PR this century.