More tweaking of test-cases for Jenkins