Fixed unit tests + Cosmetics