Database adjustments and associated preliminary spec tweaks; also, completed test data.