Adapt evaluation to new testcases