Make test site modular