improved tests, and worked on benchmark tools