Made time format more loose.
Moved empty line removal from after to before.
Removed some debugging.
Updated unit tests.