[PLAT-6849] Added tests, simplified annuity builders