remove circular relationship of Client and Scope
organize tests into api vs implementation