Streamline update code; fix copy+paste bug in update test