Add consistency tests
Add comments
Finish validator script