Fix previous merge error
Fix typo in TimeHelper
Fix tests
Add test for template sessions
[Fixes#75328948] disabling of evaluations not merged properly