4th attemt to fix tests