more fixes tests passes