Following !1316 (merged), this MR updates some tests to use ThOr functors and to be independent from production lines.