[wallace] a lot of work around shareddiver and refactoring csf tests