Fixed unit test DB calls