Fix breaks with running current set of unit tests on GH#3532

vemv merged 3 commits intoclojure-emacs:masterclojure-emacs/cider:masterfrom

ikappaki:maint/github-win-test-fixesikappaki/cider:maint/github-win-test-fixesCopy head branch name to clipboard