Added database testing (yuck)