Fix tests, but break the build