Merge pull request #31 from jonasz/master

Evaluator unit tests