Add force option and tests.