[WIP] Improves redirectTo and service tests