Tests adapted for jenkins