Fixed some issues with assertions timing out
disable done if conditions not met