Update and improve DB fixture tasks