REQS-382 - Add in Tenor class to basic finance

Address PR comments