add19724

By: Kaapo Seppänen <seppanenkaapo@gmail.com>

repair thermal branch test expectations after rebase