Cleanup CRUD tests a bit.