#513: change tests