Database changes (expanded test hierarchy)