simplify test, take care of intermittent failure