Add dependency for test
Fix statement tracking
Fix up the mock datasource
Start of a benchmark