fix options, fix test