Refactor test config for extensibility
Test more pages