additional changes to support database fixtures