fix tests
Fix errors