Unit tests + Cosmetics + Sample