Messaging on updates, fix a bunch of broken tests