Updated tests with new nml2 units