As title - make some useful tests executable more easily, and fix some issues in the set-up.
FYI @xilin @sroe @bruckman