Refactored Performance tests for block indexing