Fixed auto update tests.
Merge remote-tracking branch 'origin/master' into submission-fixes
Moved messages into the datastore.