Toaster: functional test fixes so that it workS with saucelab