Add timeouts to acceptance tests to try and diagnose timeout issue on CI