Fix bad RemoveCandidate bug

Also more stv tests and touch up