Tryng to get EvMe tests working again.
Merge pull request #214 from roydude/v1-train

Tryng to get EvMe tests working again.