fixes for toolbar tests