Fix test compile errors