Add missing evaluate (see #171)
Fix tests (see #171)