Fixed tests and build.