remove some legacy code from tests