More evaluation, more tests