Updated DatabaseProvider to work with modeling tests