The test fail due to missing implementation, Hence I put them in todo's. After the implementation is there, they do not fail. I think thats the procedure followed. I have put the remove todo's in separate patch, as its large.
James is correct, patches 2 and 3 should be concatenated. 2 is already necessarily large, and adding 3 to it doesn't add much to its size. --Juan