Fixed build and unit tests.