Added database testing