fix for ndv handling; more testcases