Can we have a test specifically for this bit? Also one that covers the TODO.