Update message status change handlers accordingly

And add tests!