Fixed build and tests.