Updated Tests to use the new Generated API.