Fixing failing tests after mering master.