fixes stupid mistake during merge (missed import)
fixes tests