Stub friend activity, clean up tests a bit