Fixed the tests and build.