Fixed up build, and got unit tests compiling.