better tests, everything passes, nothing to do but wait for upstream revs

Change-Id: I9ac35e24eded8305283c4febae5fec587ed485a0
otherjon's changes to the test configs -- not for upstream merge