Tests corrected. Fixed #27