Fixing some failing tests