Updating generated nml1 & adding tests on validity