Database and DerbyTest update