Fixed a bug where the plus sign icon wasn't responding to click events.
More test coverage, figured out my issues with firing events programmatically.
Merge branch 'master' into testing