fix EFM 6.23 testing issues