<run> and <defun>, a host of minor cleanups, cleaned up tests