Fixed test again, removed swap files