#656 - Fixed lastUpdate in T&C + added testcase