More robust tests