Fixed Swetest error, updated Dasha classes