changed redirect to 301; group tests by service