Fix puller and update tests