I would like it if all units under a certified course challenge were counted for the sake of badges. The course challenge shows that you have become proficient in the knowledge contained in those topics so it feels appropriate to count them all towards that badges.