Switch to dash.el versions of -when-let and -if-let
Separate out run-tests.sh