Refactored arguments for evaluate-apply
Divided remaining benchmarks/testcases over separate files
Removed displays in evaluate-if