Fix unit tests - broken before branch was created :-(
Merge remote-tracking branch 'origin/StatementClientRefactor'