More efforts to get test suite running on Jenkins CI server