UK: -u allows the template files to be in working directory
UK: restore site_id, other tests should not be affected now