Fix checking of , fixes tests