all NAL 1 & 2 tests edited, and pass