cleaned init
Changed tests + small fixes