Update dpxdt, add timeouts to tests