improved db fixtures