Rewrite OCL / perf tests