Make compatible with new current data test