Use merge! instead of update and fix some tests