Add the new stuff for tests and db