Ok, all the tests seem to pass now. I think the edit is complete.