Added further schema tests.