Added deletion, more tests