Fix various bugs in status updates, tests now pass again.