Get the StatementWrapper to work, add tests