Update; test challenge handling.