Add more update tests, resolve attribute conflict in update reload