NAL8 test syntactical fixes
Merge origin/master