NAL6 tests, separated into files, before rewriting for unit test format
Merge origin/master