Ah, it seems that the tests still use the starterTemplateLoader grade, even though the demos don't. Should they be?