Add tests and doc for new options