[CLC-2400] Enforce term-year limiter to temporarily cheat on performance
[CLC-2400] Flagging the tests, branching tests for single term logic