This patch lets the tests build and succeed: