Post-merge fix part 2 - fixing failed unit tests