adds better test coverage for toolbar button and draggable module.

- includes an adjustment that moves some logic that should be in plugin back into plugin.