refactored to moment.js and updated tests