Refactor reset table and tests
Finish fixing database tests