Further Minor TestTweaks