Fixes for tests failing on Jenkins autorelease job