test some more scenarios

(many are still missing)