Final fix for jenkins tests