Unit tests corrected according to guidelines