Fix unit tests for emacs23