refactored NALTest