More test fixes for jenkins....over to you Akbar