Added db, jUnit testing