Remove code from tests