a few fixes to improve things when running tests on CI