Move tests more centrally and expand a bit. Continue with refactoring DB.
More tests, make them work.