[PLAT-5331] Switched to use user-specified tenors rather than resolved tenors in result.