Merge "Update tests."