Merge "Update tests to work with NICRefactor enabled" into main