Tests updated to use current data.