#525: change tests