Some clean up and fixes of ocl::perf tests