Adjust tests to toolbarrefactoring

Adjust tests to https://gerrit.wikimedia.org/r/#/c/161453/