Slightly better Paxos test; some changes to controller logic