Remove tests for toolbar plugin
Tidy up
Merge branch 'oja-rm-toolbar-plugin'