I've fixed the failing tests (on the current feature branch)

Except for
test/test_liveserver.py::BaseTestCases::test__generic_item_template_editbad
test/test_liveserver.py::TestFeatureFlagCacheTrackerOff::test__generic_item_template_editbad
test/test_liveserver.py::TestPostgresWsgiServer::test__generic_item_template_editbad

These fail when running the whole test suite but pass when running a single test.
They were marked xfail which I have removed in my current sandbox.