Users test + refactor for new db structure.