PLT-466 - Refine definition of Frequency and Tenor

Use months when less than 24 months and years above that
Unify definition of 1 year to be 12 months
Unify definition of weeks vs days
Extra tests