MANTA-28 add unit test and fix for another graph build failure case from m28 branch