The acceptance tests are flaky so I've decided to port them to system test which makes them easier to work with and reason about.