CarTest refactor