Site refactoring and testing