fixed delete unit tests and added cleanup