modify some OT class to performance test