Unselect previous tenancy radio if not demoted

* Plus some spec refactoring