Refactored to nicely call the right page generator. What's testing?