Changed test scenario and diagnostic logging.