Fixed some unit tests. They'll have to be migrated to integration tests
sometime
modified comments when showing captcha
updated version
renamed methods from "flush*" to "clear*"