init
Fixes and add test