Fix tests for removal of confirmation screen