Added verification client bug fixes and tests