and fix test