Code appears to be working for Tahoe test case 2 (as well as all other test cases).
Merged.