See if this fixes tests