Merge "Update tests to reflect API bump to 20."