Merge "Fix failing puller unit tests"