added tests as prepared by oliver