added tests
Merge branch 'addingtests'
Merge pull request #1 from jakobkroeker/master

merged in tests