Update dataloader and tests