rename and unit test datetime helpers