Another PR / rebase.  Also this test is important; if it's failing we need to fix it as it checks functionality which is really hard to debug when it fails in production.