Combine API-V2 tests with existing site tests