Not the client task
Adjust tests and refactor detect-context