Second attempt to fix "make test"