Fixes to ConfirmView tests based on second review