Updated unittest-mode from upstream