Update update, use data set on parent, not explicitly passed
Refactored fixtures to be modules