wip - add timeouts/status updates for test