Fixed unit test crash.
Revert "Fixed unit test crash."

This reverts commit 261b156a893afc916c3a2391643bad17983ac597.
Fixed unit test crash properly.
Fixed more unit test crashes.
Style fixes.
Merge branch 'mlucy_2453' into next