Try to make tests more stable