be more consistent
Merge remote-tracking branch 'ojii/toolbar-api' into toolbar-3000
fixed issues in live server tests
Merge remote-tracking branch 'ojii/toolbar-api' into toolbar-3000