Refactor and clean of useless attributes and imports in our tests