Fixing tests

Fixes #7
Replacing timeformat with dateformat

Fixes #10