Tests corrected