Merge "Change pointer to allocation in unit tests."