EnterTestMode gets even better

Signed-off-by: Michael Fraenkel <fraenkel@us.ibm.com>