Add test for deleting
Fix up some tests so it doesn't conflict
User tests