improving tests to fix the build