[Task Fix] Add client scope and registration before tests; cleanup