Remove unused code from brnchmark
Add threading test