#523: change tests