Unit tests corrected