Fixing issue with additional date formats, added some tests

This should fix #48.