Surprise incoming
Adds two tests
Adds some additional tests for other features
Removes useless tag :-)

Woops.
Merge master into branch
Merge pull request #261 from boersmamarcel/onemorething

Activities.