Fixing UI tests under extension model