misc test fixes, including emacs file-local var to turn off deleting trailing whitespace