fixed some failing tests