Initial working version
Fix test