Updated tests. Did not run yet.
Commented out with-db! and with-local-db!. Tests will not work, but other parts are functioning.