Adding more tests and delete fn
4 files changed