enhc: refactor benchmark tests