Add timeouts to make test

Review 750 by @mlucy