Test cleaned up to improve safe termination Reviewed-by: michaelm, vtewari, dfuchs
Reviewed-by: dfuchs, vtewari
Reviewed-by: darcy, ihse