Fix  tests