Minor cleanups in templates test imports