Fix build & tests

Make test suite buildable again.