Fixing broken tests again