Tryng to get EvMe tests working again.