Added tests to Schema