added tests as prepared by oliver
Merge pull request #135 from ikorb/patch1

added tests as prepared by oliver