DRILL-967: Correcting age functions; added tests.