#497: change tests