Fixed broken unit test.
Fixed unit test build.