Update with tests