Fix some of the test-suite timeouts (#882)