bench test code reorganized