Why did you remove the original tests? IIRC the `return` pattern was what we were most concerned about.