remove dodgy delete and add more tests