fixing tests and build.