Removing redundant list calls
Example guest HTML pages
Simplifying test cases