REF: More robust testing