NAL5 unit tests seem to pass, with slight modifications (noted)