MANTA-28 add unit test and fix for tricking overlapping node error from m28 branch test