Schema implemented. New test cases.