Add force_homoclave option, refactor tests

and fix some minor typos.