Added tests #6385