Test Page Generator - Cleanup