Tweak test to work better with front-end mode