Add tests for activities (thnx jan), and move original tests to new folder
Merge pull request #109 from triplem/movetests

Add tests for activities (thnx jan), and move original tests to new fold...
removed unused code