reconfigure for SQL Expression API and add dbtest