(#11) Performance: updated infrastructure: fixed tests