Get rid of unnecessary TODOs. Additional tests are unnecessary -- card tests suffice.