fix some options, update tests