fixing tests and including NoContext evaluators