Fixes for errors when doing "make test" on a clean checkout