fix test compile errors
22 files changed