add executeScalar back, fallback to it in executeAndFetch
fix tests after rollback, add new test for fallback