Merge "Update tests due to clang variable and struct naming changes."