Fixes some test build errors.