Fixed yet another unit test derp.

C++ unit tests pass now.