fixed some failing  tests