Fix issue where variants was not set
Adapt 'no registry key' tests to new main_template aware site layout resolver