WIP: Fix unreliable functional tests in CI environment

Currently, this MR is just a place where I'm testing a few different potential fixes to some of the functional tests that fail in the CI environment but work fine in my development environment.