Unit tests + Cosmetics