Morse tests and fixes