add few options, update tests