Flesh out #confirm tests and refactor a bit.