Added schema tests