Remove nomcomwiki and vewikimedia from tests

Change-Id: I1b1f80f203947b952e300136e721ef0d91d50002