When running tests on multisite, pass $blog into switch_to_blog() so all options are correctly cleared. See r7028.

git-svn-id: https://buddypress.svn.wordpress.org/trunk@7031 cdf35c40-ae34-48e0-9cc9-0c9da1808c22