Further modifications to the libra e2e tests.  Intermediate check-in, need cleanup + further refinement