Removing the use of test/private-browsing/helper as much as possible for now