Fixed the build and the tests