Fix NBLAST1 test and add tests for NBLAST2