fixing failing tests - adapted to new libs (oldest were removed)