Updated todo. Added missing test.