otherjon's changes to the test configs -- not for upstream merge