Update tests to ThOr functors and decouple from production

Felipe Luan Souza De Almeidarequested to merge
felipe-update-tests into master

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

Merge request reports