More validation, new organization, new format, more tests