Fix a broken test. Re fix #1089 to work for removing pending owners when there is a single non-pending owner. Add a unit test of 'won't remove the last owner'.