Make testing more robust