Fixing error
Fixing more tests