Revert "Revert "make test: fix broken interfaces""