Make new tests more robust (travis was failing...)