Small edits. Added test for failed date-format. needs more work!