Fix errors
Fix test