- fix test build failures
