improved tests, and fixed the build...