Modified DB tests