Fix tests related to the thor generator

ref #1740