Move schema tests around