Fixed the remaining schema tests