added tests as prepared by oliver

Because someone seems to be unable to cherry-pick from incoming pull requests