Merge "Update test to work with NICRefactor flag enabled" into main