Additional tests

Two more scenarions left to add (convert from Obj-C)