Fixed failing tests after merge with master