Fixed issues in benchmark tests