Clean up
Add DELETE test
Clean up