make tests more robust