refactor: cleaning up shared client context and scope specs