switched to new database layer, need to change the rest as well
second step change
next step
database tests are working now, need to fix struct tests