Refactored site test suite