Make tests run again.

ci.sh still doesn't pass, but it's closer.