Merge "Remove claim that scenario tests need 2 services"