Fixing repo tests after removal of deprecated schema elements.