Harden up Edgetest a bit