Update schema validator according to new format
Add schema validator tests close #4