fix test and changes