few more tweaks in an attempt to get Jenkins to run our tests

plus nudge

Change-Id: I9ce78e60f5c08e4d0d131a5fd198dabed9182e12