[2.0][DDC-171] Fixed (second attempt). Some other cleanups. Performance fix for mock Statement used in hydration performance tests for more accurate and better results.