Updating tests to handle extra data.