Fixing broken tests after the latest rebase