Progress fixing tests to not rely on tornado templates.