Re-organizes test-service page