Fix after pull rebase that broke tests