Integration test updates
Support empty pages