improved object class, new DatabaseModel class, new tests