[PLAT-6201] Changed Annuity builder. Changed the related tests.