improved update/delete, improved tests