Fixed unit tests.

Updates to fix broken unit tests.