Updated age calculation algorithm and improved test coverage