Investigate why tests are running slower locally

I'm seeing a large difference in tests running locally (> 3 minutes locally) and some in particular are running 10X slower

The Makefile has the timeout set to 1 minute which should be enough time, so we need to look into speeding the tests up