times fix for node fixes #27

 - also added some tests
Merge pull request #28 from HubSpot/timesFix

Times fix - fixes #27