Collapsed to single change/revert step. Rename fixtures. Add data_loader helper.