Merge "Fix broken NSSL tests"