sclean up and added a date handler mock