Fix scope on all /phpunit test methods

Change-Id: I3ce92463d485a0fb23e464e9a8059330f32d79af