Add return on update and delete, add more tests.