Remove some unused stuff from tests.common